Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 29 Dec 2011 20:38:17 +0000 (12:38 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 29 Dec 2011 20:38:17 +0000 (12:38 -0800)
commit5a0f296cde8a34f0ad90a3479c375e8ac011c04a
treec27c91a55dbea2dc47709a9a2b9de315acb5b9dd
parentc219593d2b1edc050e63d079b438122cb717a3d3
parent209f5252fc9787ff1e6166f7751bf4ff7459692b
Merge from trunk.